bitkeeper revision 1.1159.83.1 (4152f976-8zbYss32IZrnHKQS9VCaw)

minor migration cleanup

diff --git a/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c
index bc3d2363263041cbdf0329e713c1503731f188f1..26aa52cae69ba17edbdad0c4835d22dbcbf74b81 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c
+++ b/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c
@@ -208,16 +208,14 @@ static int vif_wake(struct net_device *dev)
 {
     struct sk_buff *skb;
     u32             src_ip, dst_ip;
-    unsigned char   dst_hw[ETH_ALEN];
-
-    memset(dst_hw, 0xff, ETH_ALEN);
 
     dst_ip = INADDR_BROADCAST;
     src_ip = inet_select_addr(dev, dst_ip, RT_SCOPE_LINK);
 
-    skb = arp_create(ARPOP_REQUEST, ETH_P_ARP,
+    skb = arp_create(ARPOP_REPLY, ETH_P_ARP,
                      dst_ip, dev, src_ip,
-                     dst_hw, dev->dev_addr, NULL);
+                     /*dst_hw*/ NULL, /*src_hw*/ NULL, 
+                     /*target_hw*/ dev->dev_addr);
     if ( skb == NULL )
         return -ENOMEM;
 

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index ec27a5eb8da5f862701723eff022f87b4c13d4af..ade285129c0753916439273e17a7b32e8f9ae68b 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -223,12 +223,12 @@ void arch_do_createdomain(struct domain *d)
        virt_to_phys(&machine_to_phys_mapping[0])>>PAGE_SHIFT;
     SHARE_PFN_WITH_DOMAIN(virt_to_page(d->shared_info), d);
     machine_to_phys_mapping[virt_to_phys(d->shared_info) >> 
-                           PAGE_SHIFT] = 0x80000000UL;  /* debug */
+                           PAGE_SHIFT] = INVALID_P2M_ENTRY;
 
     d->mm.perdomain_pt = (l1_pgentry_t *)alloc_xenheap_page();
     memset(d->mm.perdomain_pt, 0, PAGE_SIZE);
     machine_to_phys_mapping[virt_to_phys(d->mm.perdomain_pt) >> 
-                           PAGE_SHIFT] = 0x0fffdeadUL;  /* debug */
+                           PAGE_SHIFT] = INVALID_P2M_ENTRY;
 }
 
 int arch_final_setup_guestos(struct domain *d, full_execution_context_t *c)

diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c
index ea73908a965cb55fb7142e4ccb9b5fc715338182..84c7ade98c5813cddc18f97df01e87cc4f36300b 100644 (file)
--- a/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@ -1802,6 +1802,12 @@ static __init int ptwr_init(void)
             (void *)alloc_xenheap_page();
         ptwr_info[i].ptinfo[PTWR_PT_INACTIVE].page =
             (void *)alloc_xenheap_page();
+        machine_to_phys_mapping[virt_to_phys(
+           ptwr_info[i].ptinfo[PTWR_PT_ACTIVE].page)>>PAGE_SHIFT] =
+           INVALID_P2M_ENTRY;
+        machine_to_phys_mapping[virt_to_phys(
+           ptwr_info[i].ptinfo[PTWR_PT_INACTIVE].page)>>PAGE_SHIFT] =
+           INVALID_P2M_ENTRY; 
     }
 
     return 0;

diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index 2d399bded7ffa08648d9dfa0a23323ec0ad913f4..cd565d8dcc5f436df5f0a741d78980bbbc2cfc32 100644 (file)
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -116,6 +116,8 @@ struct pfn_info
         spin_unlock(&(_dom)->page_alloc_lock);                              \
     } while ( 0 )
 
+#define INVALID_P2M_ENTRY (~0UL)
+
 extern struct pfn_info *frame_table;
 extern unsigned long frame_table_size;
 extern unsigned long max_page;